Autogenerated HTML docs for v1.8.0-150-gb0b00
diff --git a/git-config.html b/git-config.html index 7b9cd4b..5e359a6 100644 --- a/git-config.html +++ b/git-config.html
@@ -1805,14 +1805,14 @@ <tt>LESS</tt> variable to some other value. Alternately, these settings can be overridden on a project or global basis by setting the <tt>core.pager</tt> option. - Setting <tt>core.pager</tt> has no affect on the <tt>LESS</tt> + Setting <tt>core.pager</tt> has no effect on the <tt>LESS</tt> environment variable behaviour above, so if you want to override git’s default settings this way, you need to be explicit. For example, to disable the S option in a backward compatible manner, set <tt>core.pager</tt> - to <tt>less -+$LESS -FRX</tt>. This will be passed to the - shell by git, which will translate the final command to - <tt>LESS=FRSX less -+FRSX -FRX</tt>. + to <tt>less -+S</tt>. This will be passed to the shell by + git, which will translate the final command to + <tt>LESS=FRSX less -+S</tt>. </p> </dd> <dt class="hdlist1"> @@ -2652,6 +2652,21 @@ </p> </dd> <dt class="hdlist1"> +diff.context +</dt> +<dd> +<p> + Generate diffs with <n> lines of context instead of the default of +</p> +<div class="olist arabic"><ol class="arabic"> +<li> +<p> +This value is overridden by the -U option. +</p> +</li> +</ol></div> +</dd> +<dt class="hdlist1"> diff.external </dt> <dd> @@ -3968,11 +3983,11 @@ <p> If merge is called without any commit argument, merge the upstream branches configured for the current branch by using their last - observed values stored in their remote tracking branches. + observed values stored in their remote-tracking branches. The values of the <tt>branch.<current branch>.merge</tt> that name the branches at the remote named by <tt>branch.<current branch>.remote</tt> are consulted, and then they are mapped via <tt>remote.<remote>.fetch</tt> - to their corresponding remote tracking branches, and the tips of + to their corresponding remote-tracking branches, and the tips of these tracking branches are merged. </p> </dd>
